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

Change-Id: I3dfc4eba9811bee854361e94f006723a57f6008f