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

Change-Id: Icd86582f7c19ec23776be2a0e0b2dfb327e477f1