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

Change-Id: I850b67608222ab07dc68494a98a95940643bb046