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

Change-Id: Ieca3cc8bd1983794aaa6268cdf4237d19b23cbea