Import translations. DO NOT MERGE am: b8aaaa8949  -s ours
am: c967ede5c8  -s ours

Change-Id: I8ebb662bfa9ad1a4e1b3ef14d9f221e5aadf6c69