Import translations. DO NOT MERGE am: f378cd950b  -s ours
am: 19d5f181e2  -s ours

Change-Id: I90323ba8eb3f790c254a985a4b13125ab6c20473