[CLC-1178] Lots of Timezone related fixes
Merge pull request #617 from yuhunglin/CLC-1178

[CLC-1178] Lots of Timezone related fixes