Import translations. DO NOT MERGE am: 2ec9c307a4  -s ours am: f38f0b5b5b  -s ours
am: 2933b01dc4  -s ours

Change-Id: Ic7412e7b52b1ad2c1fa35b2acbfd98c8f6260dd6