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

Change-Id: I5edbac6f97540fb3e1b8b15d0a9a9cd660d553ab