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

Change-Id: Ic2d73b794e4625d26e33c12d02d4692215de8f90