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

Change-Id: If9a48ca767aee1ad8ec0b54c1f2ab49e23a0e594