Import translations. DO NOT MERGE am: 59a9f1087b  -s ours am: 21800216e4  -s ours
am: 4e236d6c21  -s ours

* commit '4e236d6c21cd3491fbb8ea12cd9362cc51e01011':

Change-Id: I9f4caca31b032ec2bed4ebadfe00a105344a3308