Merge "ToneGenerator: add tones for New Zealand" into tm-dev