Import translations. DO NOT MERGE am: 41c8c2a57b  -s ours am: f07d4052af  -s ours
am: 8b9374b83c  -s ours

Change-Id: I2a581ac6101af30f71b0f76ef267b1171651c11a