Merge "Fixes failing test after coroutine lib upgrade." into udc-qpr-dev