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

Change-Id: I59b1200a3703aa84e4231b91aef9799f87983d47