am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev

* commit 'a626f8d854d65609c71f602d79b0360359e5b5b7':
  Make StorageMeasurement multiprofile aware.