Merge "fs_mgr: fix clang static analyzer warning" am: 847670437b  -s ours am: a10dcbdf6c am: 90d1339bc9
am: 9c40e15fa2  -s ours

Change-Id: I7c06787153416d549f2b9bf9a97637f7ad734185