am 8cf1ea90: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '8cf1ea908dbb2c1a1252cecdc6d0f961373502aa':
  Import translations. DO NOT MERGE