[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 97b4444838  -s ours
am: 7154c61365  -s ours

Change-Id: Id533922923497111e92a9481b149b613e296b066