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

Change-Id: Ifd794f379dd0c178cbe2d6fbbeaeaf7b70226345