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

Change-Id: I2f9b5c859cdb7f0710c5ecdd496fa6e700082dbd