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

Change-Id: I7e2c2f6b4081255210a646b9023e9173f7130d56