am d5342bea: (-s ours) am bd5898e1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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