[automerger skipped] Add a timeout for the DNS probe. am: 28c966eaa9 -s ours
am: 37673bcd68 -s ours
am skip reason: change_id Ib3ab9105d7ae39f551b51e8d5a04b9ec5e549655 with SHA1 6413419435 is in history

Change-Id: I45f5f108935d238e5a374004ba37cc1f0206bf03