Merge "Revert "Minimum viable TimeZoneDetectorService""