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

Change-Id: Ie5321ac9da5a10e8bbf8e3aa022533074fb0f521