Merge "Convert frameworks/native to Result::ok()" am: 4a495bd448 am: 445b5a49c4

Change-Id: I5822a719a3721cdf1e4e3a81650ca00bb117e180