am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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