am 51beb6b7: (-s ours) am ec93832b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '51beb6b77bc51187a09602b8cf01a7b0ed9862c1':
  Import translations. DO NOT MERGE