[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 29bc6e6c1f  -s ours
am: ec2552b91a  -s ours

Change-Id: Iaf2a7143a3d346686976a375f04bd4f1e394dfe1