am fcf1178c: (-s ours) am 04e2eb1e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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