[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 830011bf33
-s ours
am: 77c816b4fa
-s ours
Change-Id: I000639f7d42cc9c4f4a720e1228e784fd851852b
This commit is contained in: