Merge "fs_mgr: correct error handling" am: 16c870270f am: 24cddf17b4
am: 6d9cd77ff9

Change-Id: I527fd38e28fe6b3de88d218fbf2d5a4c4c3b52ab