Import translations. DO NOT MERGE am: 41d38e53b8  -s ours
am: 2ed82937d3  -s ours

Change-Id: Ibd35ae7ff64941c172b948df3f9f64edb270fdae