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

Change-Id: I6f7ddc9f4067fea19bb5957c8c9b3166f6f44651