Merge "Refactor Clocks to use MessageBuffer + Logger" into udc-qpr-dev