Merge "EncryptionTest: add CddTest annotation"