Merge "Add ChaCha20-Poly1305 as an enabled cipher suite"