Merge "Fix TimeDetectorServiceTest." into sc-dev