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

Change-Id: I39f9be5faec32f85880a8c571f0773142322dbcd