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

Change-Id: Ie116d1be6afac3e17664ccc698c9d87224846d6e