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

Change-Id: I37b6cb41f86f485350a4d51a65758ac189eb7570