Merge "Revert "Add timeout logic to TestWakeupClientServiceImpl.""