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

Change-Id: Iee12ab5b6592694d7b8505d8a73d4e5b43c68a31