Merge "Update ClockChangeListener to match new interface type" into tm-qpr-dev