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

Change-Id: Ifba436c774867e3d5eeb77d8f7157e3f4cda1ea2