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

Change-Id: I1545701778fdfcf0cabb08329b0588d6fb7086cc