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

Change-Id: I3ccce970c788944cbdf597e92766b1fa30d2009e