diff --git a/config/country_dialing_codes.yml b/config/country_dialing_codes.yml
index b2ab8081478..11c575dc2c9 100644
--- a/config/country_dialing_codes.yml
+++ b/config/country_dialing_codes.yml
@@ -49,6 +49,11 @@ AR:
   name: Argentina
   supports_sms: true
   supports_voice: false
+AS:
+  country_code: '1684'
+  name: American Samoa
+  supports_sms: true
+  supports_voice: true
 AT:
   country_code: '43'
   name: Austria
diff --git a/config/locales/countries/en.yml b/config/locales/countries/en.yml
index 6222fd1a83c..5c11093037b 100644
--- a/config/locales/countries/en.yml
+++ b/config/locales/countries/en.yml
@@ -9,6 +9,7 @@ en:
     am: Armenia
     ao: Angola
     ar: Argentina
+    as: American Samoa
     at: Austria
     au: Australia
     aw: Aruba
diff --git a/config/locales/countries/es.yml b/config/locales/countries/es.yml
index a0eb31e8e13..ed649828f19 100644
--- a/config/locales/countries/es.yml
+++ b/config/locales/countries/es.yml
@@ -9,6 +9,7 @@ es:
     am: Armenia
     ao: Angola
     ar: Argentina
+    as: Samoa Americana
     at: Austria
     au: Australia
     aw: Aruba
diff --git a/config/locales/countries/fr.yml b/config/locales/countries/fr.yml
index d6703ef59d5..c0f9c0dc3b4 100644
--- a/config/locales/countries/fr.yml
+++ b/config/locales/countries/fr.yml
@@ -9,6 +9,7 @@ fr:
     am: Arménie
     ao: Angola
     ar: Argentine
+    as: Samoa américaines
     at: Autriche
     au: Australie
     aw: Aruba
diff --git a/config/pinpoint_overrides.yml b/config/pinpoint_overrides.yml
index 42df9fdfd06..56e6895a4d1 100644
--- a/config/pinpoint_overrides.yml
+++ b/config/pinpoint_overrides.yml
@@ -8,6 +8,11 @@ AO:
   supports_voice: false
 AR:
   supports_voice: false
+AS:
+  country_code: '1684'
+  name: American Samoa
+  supports_sms: true
+  supports_voice: true
 AT:
   supports_voice: false
 AU:
diff --git a/config/pinpoint_supported_countries.yml b/config/pinpoint_supported_countries.yml
index f222edd7216..509d13b24d2 100644
--- a/config/pinpoint_supported_countries.yml
+++ b/config/pinpoint_supported_countries.yml
@@ -483,7 +483,7 @@ JP:
   country_code: '81'
   name: Japan
   supports_sms: true
-  supports_voice: true
+  supports_voice: false
 KE:
   country_code: '254'
   name: Kenya