Merge "fs_mgr: Small fix in overlayfs setup/teardown"
am: 5f42ee186d

Change-Id: I65d66f1608acf61ad7ca53ac24dc183268b66bc0