Merge "fs_mgr: Fix return in error case"
am: 5821125694

Change-Id: I5d164abcdb3185bc9fe416b00e91a1e6ccb1f2eb