Import translations. DO NOT MERGE am: 2c90d6af6e  -s ours
am: 338640bb46  -s ours

* commit '338640bb4612aed4eca3cabc1436f80a50311848':

Change-Id: I1a67ce25fc6c5919827c8ae848e6942b31314922