Merge "Remove country code logging" into udc-dev