am a2aec5d7: (-s ours) am 04678abb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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