Merge "Extract TimeDetector/TimeZoneDetector interfaces"