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

Change-Id: Iede7e27936fec1d328cff25d34f0461a3a71b774