am d910cf33: Merge "Fix DefaultHostnameVerifierTest failure."

* commit 'd910cf339d61153d66f9a3d835eff027791ad78c':
  Fix DefaultHostnameVerifierTest failure.