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

Change-Id: Iea5fd4bc836f3dd4f290d8b7d74eea82e84e2394