Merge "Make ClockRegistry and its provider singleton" into udc-dev