am f6afc33e: am b2a2836d: Merge changes Id496a60e,Ie7026d71

* commit 'f6afc33eeb999be092bd49df7d5599be1a0e5083':
  StandardNames: only remove DH_* for RI
  SSLSocketText: alert during test should throw