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

Change-Id: If96f549175221087b8e5942ff286928b1bcb7f22