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

Change-Id: If83968942476f9a142aa11b04f3437e52066ec88