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

Change-Id: I3fa7ae96db0c92fdf14954f637dabfb98639c778