Merge "fs_mgr: code clean up"
am: 0914d2bdff

Change-Id: Iebda2fb1cf9aa4e70d4c8160ff42ff45300c8c40