AM/PM indicator (1/2)

Change-Id: Ia2b84456e953188ec0b07072114ae0797364fd23

fix dependency

Change-Id: I38552c69bf089dff685c37eaa0ef20edd495fca8