Merge "Revert "Revert "Assert SNI type is SNI_HOST_NAME"""