am 06b17c53: (-s ours) am a6009edd: am a722789b: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '06b17c53c0be1ec934d2d7813adc7311b9581d29':
  Import translations. DO NOT MERGE