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

Change-Id: Id9d3db95200952ca6c09117d68ca6173824ab955