automerge: 0db6536 * commit '0db6536190fa34910c0bfe376c47b8d594f32a25': Update AM/PM selectors for clock face TimePicker