Merge "Do not use completeOnTimeout" am: aa5d99cda8 am: 49647773c3
am: 5928495b64

Change-Id: I23f570c8c43b9a6f1456299bbaee0a581350db99