Merge "Remove unnecessary assert to fix flaky test" into udc-qpr-dev