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

Change-Id: I60e1afeade49ea7180987d7c67674c98ad3502a2