Timeout logic should be applied always even if the wait is active. Change-Id: I2e5db7ac8a0f9a0355ad7b40e4227d76fb002aa0