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

Change-Id: I27fab7447b0ad63eaa75d0a1d96bf199e22648d3