Merge "Convert system/core/fs_mgr to Result::ok()" am: 9421b60aef am: 60aeb9e9d0 am: 7399f679c4

Change-Id: I2e585b7620b6f27a749130f62b173574082e15ab