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

Change-Id: Ib95924b1ef3717e230d4b7b0acc3acf144013a55