[automerger skipped] Merge "Extend the timeout to obtain IpClient" into qt-qpr1-dev am: 7e1da211b6 -s ours
am: c4dd7de965 -s ours
am skip reason: change_id I757de74f54d4d35e67a9abac4746f77a56145fcf with SHA1 10f6e2ed50 is in history

Change-Id: Ib12d83c22f7fc39cfb71fba8cd7eee27b7efdf49
tree: 0275baecd5cc6eda75ccc98350c353b1621cc6b2
  1. service/
  2. PREUPLOAD.cfg