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

Change-Id: If5dae0c194229ea6ee60a8e28e9f5411a809ef7c