Merge "Fix TimeZoneDetectorStrategyTest"
am: 41c13aa123

Change-Id: Ie7f7618c5ab5699a11f8e4ce052d633f5649ea2e