[ja] Apply f7df591ae8f474ff8b1c7f8b34ea86d07671e51a
[ja] Apply 085a4966b973240acaa9ccd4472035e1254a2fcf