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

Change-Id: I516265621586f9dd8512e57fcfdaa39be75b4eb6