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

Change-Id: Ic0c609d81565fb550d954411046beb4db4e9d8b9
tree: b9045c229c19329bfe6e8c081604ed8c97c83368
  1. service/
  2. PREUPLOAD.cfg