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

* commit '6896f9d47db1f959a907d2e67e55860af23e65f8':
  always use volume mount option when mounting a partition