am b8175727: am 9a330512: Merge "Add time-to-live (TTL) support to resolver cache"

* commit 'b8175727c7a165076311f18c29f09bdc27d7be10':
  Add time-to-live (TTL) support to resolver cache