[ja] Apply b294744d98a6f6cdbc3508b0058f8616147c1596
[ja] Apply 8ec0ce6bfcd7944193a95a4794bf2cc88e874362