Import translations. DO NOT MERGE am: a7c71fec78  -s ours
am: 3070ac895c  -s ours

Change-Id: I61a1d43b6a23793ba44479116ec3d0284f0c75fd