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

Change-Id: I3aedde8f3f325f8f2af71ac4569921b3b4f2c0f7