Merge "Do not use completeOnTimeout"
am: aa5d99cda8

Change-Id: Id9e7cc7bf930051d4c874434400fb6261258c9ea