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

Change-Id: I7a2a581d0cce4bd4b85e477529ea77893111041c