Import translations. DO NOT MERGE am: ba7db5c44f  -s ours
am: 99c175af02  -s ours

Change-Id: I0b9ceec570424ac4bc540364a19eace856ae4364