Merge "fs_mgr: overlayfs_mount_scratch don't write to system_other" am: 55c083901d
am: 5526da9d44

Change-Id: I6fadc067495be2b63f29f3540a4959cb1c38310f