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

Change-Id: Idf03e48d9b814e5dda3a1e6198df43cebb0ac1cd