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

Change-Id: Ifae8bf666d9becbd8f869f3f737c3cb16c037953