Merge "Make TimeDetectorService / Strategy consistent" am: 77d5009778
am: 8e08a832dc

Change-Id: Iefabfdf89096914ae99b2117901730a800dc1c6f