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

Change-Id: I86f2b66c90f63ccde66d604122d8cae142cc0b09