am b1ef8253: (-s ours) am 326b2919: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

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