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

Change-Id: Ifcf5868eaf083f226f7afaafdbe4bcbe3410dad1