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

Change-Id: Id4397b576cda09ce91d90a75c42a7c26471e66e7