Merge "Notify ClockChangedListeners on main thread" am: e1b61141f9 am: 280826c3c1 am: 5b65d8558c

Change-Id: I5ce71a9dc64ceb04f5024e8432f731e53981dc4f