Merge "Make DNS cache lifecycle management explicit" am: a6d5664819
am: 57646109fd

Change-Id: I51cf1b7cfd49d4731d922578e8512a1326ebec63