automerge: e0fceba
* commit 'e0fceba162a3bd583fa8ed16d3d69920cadd4a4c':
Update AM/PM selectors for clock face TimePicker
automerge: e0fceba
* commit 'e0fceba162a3bd583fa8ed16d3d69920cadd4a4c':
Update AM/PM selectors for clock face TimePicker