am fed31359: am f6fcdb2e: am 28de3e59: Merge "Don\'t reset caches when dns props change."

* commit 'fed3135972f9725a44a7d9b3df728e311ac1a130':
  Don't reset caches when dns props change.