Merge "GCM ciphers should not allow key and nonce re-use"