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

Change-Id: Ia70953defd78173f9454d872561dcd779e591ec5