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

Change-Id: Ib904c4ea62197c507218859024edda94ee6766dc