Merge "Updated Japanese translations" into jb-mr1