Merge "Fix TimeZoneDetectorStrategyTest"