Merge "Reduce log size from CountryTimeZones" am: 56ebd31787 am: 19dc1fb0e0 am: b4eee653df

Change-Id: Ia72688c1db3764dac30cbb11f28366f68ef87701