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

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