Merge "Add support for the TLS Channel ID extension."