Merge "Convert system/core to Result::ok()" am: 39e990d477 am: 2c4cd27179

Change-Id: Id19f35609d7e53202b33279a12b4fd281664fe82