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

Change-Id: I36c80c2b194eb571f21f046c5ef8b20067c2bb71