Import translations. DO NOT MERGE am: 7c4d3912f3  -s ours
am: 2a66c5bd84  -s ours

Change-Id: I201e92711adc46ac6dd88f1d871b06979addc59b