am 3da05cbf: (-s ours) am 0c7b1b05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '3da05cbfbad836707db214ee9a5346527fb49373':
  Import translations. DO NOT MERGE