am d5a6a5e1: am db42a9f5: Merge "Fix three clang complaints about the DNS code."

* commit 'd5a6a5e18d66543bdfa4dffdfeec80eff32a87b9':
  Fix three clang complaints about the DNS code.