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

Change-Id: Iecbe67f13bdc7218cb47b343b4c295ce9b853347