Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." into oc-dev