Merge "Tidy up changes for TimeZoneDetectorStrategy"
am: c5725ad0a7

Change-Id: I96d8e84c8f0c6d378b8f25027eb2429e9a377652