am 46c923af: Merge "Fix country code for Netherlands Antilles." into jb-dev

* commit '46c923afd50741c8d185a6d0c7666a86c9dfe712':
  Fix country code for Netherlands Antilles.