Merge "Don't crash in StorageMeasurement if volume isn't mounted" into mnc-dev