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

Change-Id: I6c9f0a2c9e5b32eebfd571c0168b43a2c44f1e6f