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

Change-Id: I12f50513eee1c1cf3c908036fe80d3a3d8c373d0