Merge "Add additional debug for time zone handling." into jb-dev