Merge "Merge "Add control flags in asynchronous DNS query API" am: c04f9f731a am: f4a9829a18 am: f9f10f8044"