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

Change-Id: I852b8b4484ae7f285a6422e050a2820359c96a4b