am 1c20cc5c: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '1c20cc5c063bf4238309827176bb84b3e512e119':
  Import translations. DO NOT MERGE