Merge "Make StorageMeasurement multiprofile aware." into mnc-dev