Merge "Make sure waitRelative is called when waitTime != INT64_MAX"