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

Change-Id: Icd69fa703400606e32f1a6b7b28fe581e2928468