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

Change-Id: Ie6181180a21a6fb151d3c726e43b4964645bb0e2