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

Change-Id: Ia70f69e226a7800e82e29dd504351aef65048ed3