Merge "fs_mgr: remove some unused functions" am: 158dd05b8a
am: 30ab50af18

Change-Id: I713d9aed5a4ebecab6bc7d127c0b69d33ff57ffe