Making time-zone an API constant am: 2e7408eddb am: 5fd18b033d am: 085bf87210

Change-Id: I5ec459a47ee433a1f7dbf274a55fa2a342544a0f