am 478ad70c: (-s ours) am a4cbfb82: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '478ad70c488fec5b1c014febad42161e3713f0c2':
  Import translations. DO NOT MERGE