Merge "fs_mgr: fix clang static analyzer warning" am: d945f27cd6 am: a1299d28eb am: f4b9def2db
am: cf629d037c

Change-Id: I7b472680275b1f168960f63e2edfac3cb3dc8e90