Import translations. DO NOT MERGE am: 319605a34b  -s ours
am: 3eb96fe7e8  -s ours

Change-Id: I79dbc24642a18df97d795406b509d0fd6a450d27