am bb10598e: (-s ours) am d9b329ba: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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