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

Change-Id: I7ef308d0152f5bcd604210838845e273fb921896