Merge changes from topic "Java async dns"
am: 31ff0616d1

Change-Id: Ia08a8300887315d673f398b1340b2f44ce501b14