Merge changes from topic "add asynchronous DNS API flag" am: 08803bfc8c
am: 5abdf0c6e1

Change-Id: I879a1a5656ca8bafb35713e7ed3e649d66c73f30