Merge "Add Australia specific supervisory tones." into nyc-mr1-dev