am 496f0ea6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: e5661ee -s ours
* commit 'e5661ee3deb18c060b36fd12ee88ca37ec25fdda':
Import translations. DO NOT MERGE
This commit is contained in: