Merge of http://go/wvgerrit/104543 Bug: 159465432 Test: oemcrypto_test Change-Id: Idcf345088c1d40836b5e100d2f758147986a4b04