am 988d848b: (-s ours) am cb928e27: am 2e3f261d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '988d848b08ef47b50f94cd2487f2c9add75c62c4':
  Import translations. DO NOT MERGE