Merge "Rename UK tones to GB tones" into nyc-mr1-dev