Merge "Remove old C fs_mgr interface" am: 7303edd194
am: 23a18e62fc

Change-Id: Ia32fe91d8d8b67e3e9e6d560192580c228232916