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

Change-Id: I544b1afb48396b45f19a9f5eda96fe978819961b