Backport from 4.2: TimeFormat Variables - 2

Change-Id: I7118bb0443efa85d3fed73edd090dc50a1c85128