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

Change-Id: I5fe3b7fcae4f810ecbac17e2c10ca112148b9a8c