am 8e891823: (-s ours) am 786aacb7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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