Merge "Fix race condition when accessing ClockChangeListener" into udc-dev