Merge "Fix inappropriate instruction code for OmapiTest.testTransmitApdu()" am: 9fe9b27776 am: 42386f12a7
am: c9c6b696ee

Change-Id: I3c399be5a49f1bd9fb11b6986bcfbec2ca43f31e