Attempt to make waitForIdleHandler reliable. am: ae3ce81cc3 am: 8780a8afeb am: 943808385a
am: 8e3718459b

Change-Id: Ia2d7a4405ce60ca99b1ee6c80c0babf93983cf64