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

* commit '771d8227b0722565a3d82af02f1daf18b8589a87':

Change-Id: I17fe7f68b85704956da5f000fef2957ce26e3d33