Merge "fs_mgr: fs_mgr_overlayfs_teardown access to dynamic partition data" am: cf81db320e
am: 36a11db3ba

Change-Id: Ie2b8d09c0c1114d1265849b77de2a852f42140cd