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

Change-Id: I305cf0ae791f9503519884bdf382863002357ac7