Merge "Fix retry time value in dnsQueryEvent when perform DNS query over TCP"...
Merge "Fix retry time value in dnsQueryEvent when perform DNS query over TCP" am: 3b17b0a1 am: 9f4bad9e am: a7529663
Change-Id: I4d884dd5016667d675c44f00352660ed9d105422