am 0ea62edb: (-s ours) am 15d9de09: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '0ea62edbb86b2bf8ae5bab471bb057095c3d9048':
  Import translations. DO NOT MERGE