am 63954229: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '6395422929df024d2bb29a490f9ac17cdb99bfc2':
  Import translations. DO NOT MERGE