Merge "Use consistent addresses in SSLCertificateSocketFactoryTest."