Import translations. DO NOT MERGE am: aad661f874  -s ours
am: f21106b0e8  -s ours

Change-Id: I8b4225b3c88971f17fa97c9bedb0481f78260c23