Merge "base align AM/PM in AlarmAlertFullScreen" into ics-ub-clock-amazon