Merge "Extract TimeDetector/TimeZoneDetector interfaces"
am: 17ac92f460

Change-Id: I7e35f2eedbe57a8e77af8af70587a87dfa61bd26