Merge "Convert frameworks/native to Result::ok()"