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

Change-Id: Ie97fe453c89476915f3b362b6486c7d4608da2a9