Missing locality value for city-states

Addressfield does not return any results for locality for city-states such as Hong Kong, Singapore, and Dubai. Using a token such as [field_*_locality] returns a NULL value in these situations.

While a country result for Hong Kong and Singapore could be good enough, it is more problematic for the UAR, where an address in Dubai would simply return "United Arab Emirates"