am 36b5c967: am 0cb19909: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '36b5c967e11b065c97cd105496bf7fd7f6e1c2ff':
  Import translations. DO NOT MERGE