am 09db590d: am 9b6e8af6: am 3ef36b21: Merge "Use system property to set dns cache size"

* commit '09db590d56ff2b568ea1a0ce265810697f0e0e92':
  Use system property to set dns cache size