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

Change-Id: I67f0cb8bf03129eef8ab9e5ad4aff80c94ee91f3