am 334c6232: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '334c6232e8ecf978ddec4e24bd3c1af24c24a1fd':
  Import translations. DO NOT MERGE