diff --git a/odoo/songs/install/roctool_vars.py b/odoo/songs/install/roctool_vars.py
index b32d9216d46..9678bb03947 100644
--- a/odoo/songs/install/roctool_vars.py
+++ b/odoo/songs/install/roctool_vars.py
@@ -7,11 +7,8 @@
     'base.main_company': 'l10n_fr.l10n_fr_pcg_chart_template',
     '__setup__.roctool_inc': 'l10n_generic_coa.configurable_chart_template',
     '__setup__.roctool_gmbh': 'l10n_de_skr03.l10n_de_chart_template',
-    # '__setup__.roctool_taiwan': l10n_cn,
-    # '__setup__.roctool_japan': 'l10n_jp.l10n_jp1',
-    # cannot import Japan now because of this bug:
-    # https://github.com/odoo/odoo/issues/15384
-    # OPW reported on 2017-02-07
+    # '__setup__.roctool_taiwan': 'l10n_jp.l10n_jp1',
+    '__setup__.roctool_japan': 'l10n_jp.l10n_jp1',
 }
 
 crm_stages = [
diff --git a/odoo/src b/odoo/src
index d11f10f2da6..a206ad71bb7 160000
--- a/odoo/src
+++ b/odoo/src
@@ -1 +1 @@
-Subproject commit d11f10f2da6c7c261a43b3206936dbab6bb3116c
+Subproject commit a206ad71bb7ff3456d0e6df7b5224194e5741995