Import translations. DO NOT MERGE am: cb782bd43a  -s ours
am: 327259aceb  -s ours

Change-Id: I274424b67476fae5d7b9c3c6d4738a0f4173fef7