Fix clock AM/PM error.
Some countries time format is [ah:mm] or [a h:mm].

Change-Id: Iab3912f525f4417c9c7e0b154f4f76a807dd847d
Merge remote-tracking branch 'upstream/jb-mr2' into jb-mr2