am 575e3739: am 6896f9d4: Merge "always use volume mount option when mounting a partition"

* commit '575e37394ec9dc2ff0b098c7a6fe8e3f95c4808f':
  always use volume mount option when mounting a partition