[automerger skipped] Merge "Fix race condition caused by fd reused for DnsResolver" into qt-dev am: 7187dbc4 am: 05e9b9bd
am: 2d755522 -s ours
am skip reason: change_id I443bb11b15845b079ee4370a7797e692e62fa3c8 with SHA1 07de4cf8 is in history
Change-Id: I176b4ab3e57377ed5e4b257dc1ba6cb44a1bc8b2