Ensure waiters do not stuck when timeout is reached

Related-Prod: PRODX-3456
Change-Id: Ief32a3d4f1e4597624b23ec4c2bafa63b93ac34f
(cherry picked from commit 065a8482f493d964eec21ebd8af23a66bbd16a4f)
(cherry picked from commit 848057de04eaa0947b75a35cf386c1f937a466ac)
1 file changed