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

Change-Id: Ib5a0b577a09fe36ab990d2b3889e34233b172f36