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

Change-Id: I5eaa2f5513fee42a709e37d68c0bc016b58a3323