Merge "Simple pass-through TimeDetectorService" am: cb749e2e50
am: 415585f2a5

Change-Id: Id0259be3d9ad4e869c5e96cb166b8654d52c1ad7