am ae42b679: (-s ours) am 1bba64ca: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9

* commit 'ae42b67906b7f3facae2fbd1dd15d76cb2342128':
  Import translations. DO NOT MERGE