am 24a12f67: am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '24a12f67ba534bf158ee85cc998c2afbdfc7948a':
  Import translations. DO NOT MERGE