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

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