[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3c53bd0636  -s ours
am: 10163d9dd3  -s ours

Change-Id: I360168f5a58b2e7667babeb87656c18baf5c61cc