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

Change-Id: I2f6671ada5f0758346cd006dd9f2404b3f4a0a63