Merge "Optionally use LogBuffer in ClockRegistry" into udc-dev