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

Change-Id: I525a8a78e4fd17b533505e2d5fed9de0d1e5e5d9