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

Change-Id: Ic8a796a3eba61e0679904d28583f34ef222fb80b