Merge "Make TimeDetectorService more aware of origin"