[automerger skipped] dns_tls_frontend.cpp: set queries_ to 0 in startServer am: 589bd52d90 am: 9396e88bdb -s ours am: ef174ce63a -s ours
am: f06a46d409 -s ours
am skip reason: change_id I9ce9314c34420b346703500f4120304dfa58b9af with SHA1 7184fb338c is in history

Change-Id: I47bc5f8c4fdab6a8ce088689dc7f3688a5954dca