Merge "TimeDetector improvements"
am: 6e3020490d

Change-Id: Iada62157e9106ae985471e9dffcd249655c7f185