Merge "TimePicker CTS test failing."