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

* commit '639aa1d1b6a9ca601780ed9a840b568ca4d92602':
  Import translations. DO NOT MERGE