Merge "Add timeout logic to TestWakeupClientServiceImpl."