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

Change-Id: I5fbb8544613475f750f59adafc784a0ad625ea1a