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

* commit '8f54b765cb65e8e8596375c24189aa8741f0a3e5':
  Import translations. DO NOT MERGE