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

Change-Id: I452520b3c63447ac1760916b19678a2bc6c0a2da