Merge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c am: a0d2e6f4b7 am: 057e9c16e7
am: 30cc9df94d

Change-Id: I026d24b3531a24a81277b32f197c6d6a4b0a6b6b