Update Japanese APNs

Change-Id: Ia145e566f9b8a65dfb17f8d43db5c92b537b34a6
(cherry picked from commit a1998ab77a0f498ebd4bf1c3515e26b964962bca)
Merge branch into kk_mkt