Merge "Rename isTimeZoneFixNeeded to shouldFixTimeZoneNow." into jb-dev