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

Change-Id: I9f270d2e31baa284a28ec2490ebb3f9a74cf929d