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

Change-Id: I4a22b757e2e55155b041c97581118d3d02813afa