am c5cab345: am 028ccf5d: Merge "Avoid multiple dns lookups for the same query"

* commit 'c5cab3452d5ced55474e56497594579108670b51':
  Avoid multiple dns lookups for the same query