Merge "Add a timeout for the DNS probe." am: e721b4b83e
am: 133fe15fc0

Change-Id: I01d3e82828ccba060c35cc34c0f28c0535ed4ac7