Attempt to make waitForIdleHandler reliable. am: ae3ce81cc3
am: 8780a8afeb

Change-Id: I72c03d3686858631aefdf96e13e8033f27788f8c