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

Change-Id: I793e236feb2666c7ec2081b6cab4cc474eda7a1f