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

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