am 95209c5c: Merge "InvalidKeyException for "opaque" keys null getEncoded()"

* commit '95209c5cfe562ee9cc5ec08820c0e1c1a874cbb3':
  InvalidKeyException for "opaque" keys null getEncoded()