Merge "Move some definitions into anonymous namespaces" into udc-qpr-dev