Merge "Switch settings to use TimeDetector" am: 5da6521458
am: 72ed7e8f64

Change-Id: Ia2f12a24835f83136c9400641992348b69f40270