am b3b9adda: (-s ours) am 33efdd7d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10

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