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

Change-Id: Ie93318a9e3543fa1d1e6cc4649679a6cae1ac2a4