Merge "fs_mgr: remove old fs_mgr functions that are not currently used" am: 2648b801ed
am: acf95ae6d4

Change-Id: Id52aebb44ff620a5f200ac3386e71abf88189c53