Merge "Merge "Reduce log size from CountryTimeZones" am: 56ebd31787 am: 19dc1fb0e0 am: b4eee653df" into rvc-d1-dev-plus-aosp am: 9f5a938cf2 am: 4b1169c48d

Change-Id: Ifa470b33290f203bb557c5154968a13e8dbbc5cd