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

Change-Id: I1364131e70bee390c08e8ebf26f89368cd1f4d42