Merge "Avoid changing global TIME_12_24 during TextClockTest"