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

Change-Id: Idf64cb1222e7b0ba4aee3a313faed4d3253701ef