Merge "Reduce log size from CountryTimeZones" into rvc-dev