Upstream changes from v5.8.4

Metadata changes:
  - Adding a token to indicate which countries have mobile portability.