Merge "Fix race condition caused by fd reused for DnsResolver" into qt-dev
am: 7187dbc4e0

Change-Id: I4f954890cbcc20736fdefb2d85fd9a2912f5be40