Merge "Add more behavior to TimeDetectorService"