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

Change-Id: Ib0d4012bd1bf3165dbd14675b5a5974be2ad8b53