Merge "Use mount modes logic from StorageManagerService" into sc-dev