Import translations. DO NOT MERGE am: f049bd4720  -s ours
am: 892c8a4eb7  -s ours

Change-Id: I9da1a77470ea756dd85f0398ab59219e089ce87f