Merge "Make TimeDetectorService more aware of origin" am: 4ef2551dfa am: 3150e58082
am: 84c6981a8f

Change-Id: Ica76e3630488a31c42ecd3b654d1a47a453e8bde