Import translations. DO NOT MERGE am: e8b1aebb88  -s ours am: 489f0674c8  -s ours
am: d3e14b8420  -s ours

Change-Id: Iaf34e2f11db0d4130a3335b5143abd6347f1d8bf