Merge "Prevent some leaks from leaking to the next test" into udc-qpr-dev