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

Change-Id: I28baba7da55de12c2e6ef84cfd961b833cffe815