Adding an address template for HK, adding street2 and removing postal code

Change-Id: I341fd5d8eea0a9745f4fb526e24ad1b363372569
Merge "Adding an address template for HK, adding street2 and removing postal code"