Merge "Guard potential bad clocks from moving backward" into main