am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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