Merge "InvalidKeyException for "opaque" keys null getEncoded()"