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

Change-Id: Ib7807a56597b18ec321d647a20e24975f3be539d