Merge "Revert "Change mounting storage data and obb to on by default"" into sc-dev