Merge "fs_mgr: Fix return in error case" am: 5821125694 am: b9b2ba3550 am: 54f54b1375

Change-Id: Iaca8671ebe4d9e37375e5031204992fe33fedf20