Merge "Fix TimeZoneDetectorStrategyTest" am: 41c13aa123 am: 87e60d5454 am: 89f213f36f

Change-Id: Ifbc065b451c59f811bd67c0aee945bab7cce5a01