Ensure waiters do not stuck when timeout is reached

Related-Prod: PRODX-3456
Change-Id: Ief32a3d4f1e4597624b23ec4c2bafa63b93ac34f
1 file changed