Merge "Fix DefaultHostnameVerifierTest failure."