Import translations. DO NOT MERGE am: 73fd6e9530  -s ours
am: d4d11c5dc8  -s ours

Change-Id: Ic3525088ad0cd71169de51ca9e2da03e85d48db8