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

* commit '5c714f49d86dab99681f9adf9b6e7de5e8e22478':
  Import translations. DO NOT MERGE