Merge "fs_mgr: fix memory leak"
am: 9bbcea1878

Change-Id: I4c82760de7301be80fe2bc39fe8aa9d2f5e7f698