Import translations. DO NOT MERGE am: a1e4c85589  -s ours
am: 94e1df30a7  -s ours

Change-Id: I3f9c5191d0f0b8ac7dbffb14a80ca09e4f293a87