Fix PR 321994

Fix timezone conversion bug
PR: 321994