[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 1c0fac386f  -s ours
am: 19e8bae596  -s ours

Change-Id: I94e42a405120c90c58e9f340db42295575c8bb14