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

Change-Id: I603698fe6e0326e1a62626706bd8c768a63079fa