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

Change-Id: Ied25957657a02be2648673ab1c0a6f0731b622af