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

Change-Id: If69acb4e197972cc1a878cfd7b221d161470e9e4