Import translations. DO NOT MERGE am: d5fa4b82f1  -s ours am: 44bdd48a48  -s ours
am: 9eab93b1db  -s ours

Change-Id: I27465ae21f3d9b26fb7e162fb9ded58d2d90785d