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

Change-Id: If8bb311453375f50f8276608e5b2dc8de5cdca3b