am 297013dd: (-s ours) am 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '297013dd4cee3f27f1df73bde642d8636492954b':
  Import translations. DO NOT MERGE