Merge "[automerger skipped] Merge "Simple pass-through TimeDetectorService" am: cb749e2e am: 415585f2 am: a3aa3221 -s ours"