Merge "fs_mgr: fs_mgr_overlayfs_teardown_one failure to teardown scratch" am: 30fa1b7864
am: 254cbab997

Change-Id: I2ba4df16b4a1b298eca679f7d4c308ed88ce21a4