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

Change-Id: Id9e9a1fba6c00a60f4e4c4755f302c608e1ddddf