am 1c2fb243: am 8ed48222: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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