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

Change-Id: Id03f682dd08cf762461670228a1ff82a1a85e9cf