Merge "Rename SimpleTimeZoneDetectorStrategy"