Merge "fs_mgr: fs_mgr_overlayfs_mount_scratch try alternate"
am: 224263da96

Change-Id: I107091442a256652a0ca46ff74cb027b83ef56bb