Import translations. DO NOT MERGE am: 6dc837f102  -s ours am: f3e1874420  -s ours
am: e3a87db1c6  -s ours

* commit 'e3a87db1c610f3edec6858eac9e680c6a7509d48':

Change-Id: I2817c893e5f08db983cd1c37c6c3110aa760399c