Merge "fs_mgr: fix incorrect parameter type" am: e2015afd78
am: e53b3adc80

Change-Id: Id8006ec5bb5fdd55598fb9dd078b04551e587e33