diff --git a/data/mappings/convrtrs.txt b/data/mappings/convrtrs.txt
index f09873e..b039087 100644
--- a/data/mappings/convrtrs.txt
+++ b/data/mappings/convrtrs.txt
@@ -1227,7 +1227,9 @@
 ibm-9577_P100-2001 { UTR22* }   ibm-9577 { IBM* } ibm-1385 { IBM } # ibm-9577 and ibm-1385 are identical DBCS tables.
 iso-8859_16-2001 { UTR22* }     ISO-8859-16 { IANA* } iso-ir-226 { IANA } ISO_8859-16:2001 { IANA } latin10 { IANA } l10 { IANA }
 # BEGIN android-added
-docomo-shift_jis-2007 { UTR22* } docomo-emoji # Based on Shift-JIS
+docomo-shift_jis-2007 { UTR22* } docomo-emoji # DoCoMo specific Shift-JIS
+kddi-shift_jis-2007 { UTR22* } kddi-emoji # KDDI specific Shift-JIS
+softbank-shift_jis-2007 { UTR22* } softbank-emoji # SoftBank specific Shift-JIS
 # END android-added
 
 # To be considered for listing at a later date for the data library customization tool
diff --git a/stubdata/icudt42l-all.dat b/stubdata/icudt42l-all.dat
index c4e91e1..b681eae 100644
--- a/stubdata/icudt42l-all.dat
+++ b/stubdata/icudt42l-all.dat
Binary files differ
diff --git a/stubdata/icudt42l-default.dat b/stubdata/icudt42l-default.dat
index 56d15c0..178b9d5 100644
--- a/stubdata/icudt42l-default.dat
+++ b/stubdata/icudt42l-default.dat
Binary files differ
diff --git a/stubdata/icudt42l-large.dat b/stubdata/icudt42l-large.dat
index f07ad0d..1bca097 100644
--- a/stubdata/icudt42l-large.dat
+++ b/stubdata/icudt42l-large.dat
Binary files differ
diff --git a/stubdata/icudt42l-us-euro.dat b/stubdata/icudt42l-us-euro.dat
index c4062a3..6dd8ea3 100644
--- a/stubdata/icudt42l-us-euro.dat
+++ b/stubdata/icudt42l-us-euro.dat
Binary files differ
diff --git a/stubdata/icudt42l-us-japan.dat b/stubdata/icudt42l-us-japan.dat
index 893fd98..f13605e 100644
--- a/stubdata/icudt42l-us-japan.dat
+++ b/stubdata/icudt42l-us-japan.dat
Binary files differ
diff --git a/stubdata/icudt42l-us.dat b/stubdata/icudt42l-us.dat
index 381b80f..8c47f08 100644
--- a/stubdata/icudt42l-us.dat
+++ b/stubdata/icudt42l-us.dat
Binary files differ
diff --git a/stubdata/icudt42l-zh.dat b/stubdata/icudt42l-zh.dat
index 0e112c9..8e91882 100644
--- a/stubdata/icudt42l-zh.dat
+++ b/stubdata/icudt42l-zh.dat
Binary files differ