Merge "Convert system/core/fs_mgr to Result::ok()"