Merge "Rename UK tones to GB tones" into nyc-mr1-dev am: 984be9311e am: 5af449aebf
am: f7ba579072

Change-Id: Ieb6a2f6c9ca8955d8c0f34a64225a5bad5a9b712