Merge changes I86076b07,I7409732e,I248b1b27

* changes:
  Support Singapore specific supervisory tone
  Support Australia specific supervisory tone
  Support GB specific supervisory tone