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

* commit 'def4c0c49aeebccbb42d9b82901a7de81782baad':
  Don't crash in StorageMeasurement if volume isn't mounted