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

Change-Id: I21fe2515577cc09f649ae38141ad65d6ed76d737