[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 9a1d318b37  -s ours
am: 09df358bd8  -s ours

Change-Id: Iaa228298b45bc1686cc07faa22c65e0062d8d25d