automerge: 777949c
* commit '777949c64d335fd56eef80eadc2b09dcb5e009fa':
Update AM/PM selectors for clock face TimePicker
automerge: 777949c
* commit '777949c64d335fd56eef80eadc2b09dcb5e009fa':
Update AM/PM selectors for clock face TimePicker