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

Change-Id: I3c7022d20e66b435db09b11fcc521bd02e0a254b