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

Change-Id: Idc2b90bc0a66131769b006f10f09cf92d3c4ccee