Import translations. DO NOT MERGE am: 1742e353f5  -s ours
am: 0e2d1e2c3f  -s ours

Change-Id: I27170e0d9776d50596aa3499aab29bb234a079c4