Import translations. DO NOT MERGE am: 8aee525418  -s ours
am: 47f6271d15  -s ours

Change-Id: I9f2c7f8ffce896e53ca32192b6902760b9939bb2