[automerger skipped] Freeze IDnsResolver to v5. am: fc3a5314 am: fe12b337...
[automerger skipped] Freeze IDnsResolver to v5. am: fc3a5314 am: fe12b337 -s ours am: ce60d2bb -s ours
am skip reason: Change-Id Ifcf6076d788f601bb3b545704f2d42fd65dfdd54 with SHA-1 a126c243 is in history
Change-Id: I9b0e4c1865d40dc502b20f6a4bba54af6991efa1