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

Change-Id: Ie17f2a25770fa5ed2309052ebe09f50dbc15ddc3