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