am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: cecabf4  -s ours

* commit 'cecabf48ae85943b9c0e5b4805299794f5f3b857':
  Import translations. DO NOT MERGE