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

Change-Id: I0b29d5d235be78c5a321f8097a46ebf1f019a1ad