[automerger skipped] Merge "Switch settings to use TimeDetector" am: d32eee26 am: 5ef64ad8
am: 3296857f -s ours
am skip reason: change_id I671bf0e7e7364f64f1397d524c6277591eb4e22e with SHA1 98616963 is in history
Change-Id: I0d02b8b75e2e5481946fead9520b14b7e21f8789