[automerger skipped] Merge "Do not use completeOnTimeout" am: aa5d99cda8 am: 49647773c3 am: 5928495b64
am: 97519597c9 -s ours
am skip reason: change_id I3c8f16e1b211d7ab58a4dab54939f9e32762be0f with SHA1 355b1a82ad is in history

Change-Id: Iade90fa8410ecbcd7085eda6241cac02155bed87