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

Change-Id: I2e79e4fb105f480ceea1e7422846c6cda7499f49