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

Change-Id: Ibf47e9e480c720ebe4408b9782e056e1b709c6f4