Merge "Trivial fix forward for build breakage" into udc-qpr-dev