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

Change-Id: I9cbd5a4da3445e411e516343174fe07eb29aea0b