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

Change-Id: I67f84a0f4ad58814894ff357867c1930484fb7a0