Merge "Merge "Minor changes to the async DNS query JAVA API" am: c8dfb72891 am: 5b0b36a6b4 am: 6a047b2645"