am 7a42c809: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

* commit '7a42c80935c41b5db3151354f4a70d5a46413b74':
  Import translations. DO NOT MERGE