am ed547496: am e4872995: am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev

* commit 'ed547496691b65ae45252aee9471fb36b39bacc3':
  More useful extras in disk/volume broadcasts.