Merge "Complete Initialization of ClockRegistry in singleton provider" into tm-qpr-dev