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

Change-Id: Id86cdbb93d06f41034ab711089d3d38f58c9fb7d