diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/1_en b/java/src/com/google/i18n/phonenumbers/geocoding_data/1_en
new file mode 100644
index 000000000..d69ae598e
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/1_en differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/31_nl b/java/src/com/google/i18n/phonenumbers/geocoding_data/31_nl
new file mode 100644
index 000000000..f967ac977
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/31_nl differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/34_es b/java/src/com/google/i18n/phonenumbers/geocoding_data/34_es
new file mode 100644
index 000000000..a6efe206d
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/34_es differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/43_de b/java/src/com/google/i18n/phonenumbers/geocoding_data/43_de
new file mode 100644
index 000000000..270c2c9fb
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/43_de differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/44_en b/java/src/com/google/i18n/phonenumbers/geocoding_data/44_en
new file mode 100644
index 000000000..5185d8668
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/44_en differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/46_sv b/java/src/com/google/i18n/phonenumbers/geocoding_data/46_sv
new file mode 100644
index 000000000..c566c4349
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/46_sv differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/49_de b/java/src/com/google/i18n/phonenumbers/geocoding_data/49_de
new file mode 100644
index 000000000..87926bdab
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/49_de differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/54_es b/java/src/com/google/i18n/phonenumbers/geocoding_data/54_es
new file mode 100644
index 000000000..d4df9061e
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/54_es differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/55_pt b/java/src/com/google/i18n/phonenumbers/geocoding_data/55_pt
new file mode 100644
index 000000000..3cab21f93
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/55_pt differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/56_es b/java/src/com/google/i18n/phonenumbers/geocoding_data/56_es
new file mode 100644
index 000000000..f36465f51
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/56_es differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/82_en b/java/src/com/google/i18n/phonenumbers/geocoding_data/82_en
new file mode 100644
index 000000000..964e02644
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/82_en differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/82_ko b/java/src/com/google/i18n/phonenumbers/geocoding_data/82_ko
new file mode 100644
index 000000000..69c8afec4
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/82_ko differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/82_zh_Hans b/java/src/com/google/i18n/phonenumbers/geocoding_data/82_zh_Hans
new file mode 100644
index 000000000..eccb8a79d
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/82_zh_Hans differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/82_zh_Hant b/java/src/com/google/i18n/phonenumbers/geocoding_data/82_zh_Hant
new file mode 100644
index 000000000..e677541cb
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/82_zh_Hant differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/86_zh_Hans b/java/src/com/google/i18n/phonenumbers/geocoding_data/86_zh_Hans
new file mode 100644
index 000000000..82239cddc
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/86_zh_Hans differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding_data/config b/java/src/com/google/i18n/phonenumbers/geocoding_data/config
new file mode 100644
index 000000000..d1601e05f
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding_data/config differ
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/1_en b/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/1_en
new file mode 100644
index 000000000..6ef7841c2
Binary files /dev/null and b/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/1_en differ
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/86_en b/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/86_en
new file mode 100644
index 000000000..710e1e7f8
Binary files /dev/null and b/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/86_en differ
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/86_zh_Hans b/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/86_zh_Hans
new file mode 100644
index 000000000..1f05f35c9
Binary files /dev/null and b/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/86_zh_Hans differ
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/86_zh_Hant b/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/86_zh_Hant
new file mode 100644
index 000000000..f28679bde
Binary files /dev/null and b/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/86_zh_Hant differ
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/config b/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/config
new file mode 100644
index 000000000..0b0884db9
Binary files /dev/null and b/java/test/com/google/i18n/phonenumbers/geocoding_testing_data/config differ