Merge "Remove deprecated clock components" into udc-qpr-dev