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

Change-Id: I9a3bcb4fc66476dd3538198b578997cebb173ccf