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

Change-Id: Ie5f9d8b1e7883d2e523a8481616bcb24c3dd9b40