Merge "Add control flags in asynchronous DNS query API"