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

Change-Id: I627b48a901fe9b19a137cf13a11974b6b093d699