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

Change-Id: I7ae0f89d8667c51357ae8fb6f65963049fb0480a