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

Change-Id: I2640ed95dfa28b37365ed77d284c2ce547506b8e