Merge "ClockManager listeners receive separate ClockPlugin instances."