Merge "Merge "Add control flags in asynchronous DNS query API" am: c04f9f73 am: f4a9829a am: f9f10f80"