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

Change-Id: I7275080a3f44f96e5fde1fbfab0c0d84c6e25bbc