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

* commit '4d2593d3f2ce052de5000ebec28bc99a12dd5497':
  Make StorageMeasurement multiprofile aware.