am 1dcc9f08: (-s ours) am b17442eb: (-s ours) am 0d5e753d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '1dcc9f08cc3cfa16391baf472b42118d9537b5ec':
  Import translations. DO NOT MERGE