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

Change-Id: I894b8cfb60049b3725e006c4ea81f6a265b53e7b