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

Change-Id: I119984af3e090b3d8fde6ea1d07244592401bd68