am 59ae7069: am 8264bd80: am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '59ae7069c6051e65ffc777da65f459c050dedc5a':
  Import translations. DO NOT MERGE