Merge "Use decryption keys on decryption tests in CipherTest"