Merge "Support Hong Kong specific supervisory tone" am: 78041ba297 am: cbb79ebda5
am: 593f9251c8

Change-Id: I7176f17472b32753ef0342eec954d6e18a58025f