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

Change-Id: I9e87e8ad6d5d36210a37c7cce476ad7ca941c5d1