Support timezones

Change-Id: Ic92c68490ab7edfb8c1e39441cc5ff7c786ed413