Merge "fs_mgr: fs_mgr_overlayfs_mount_scratch try alternate"