Merge "always use volume mount option when mounting a partition"