Import translations. DO NOT MERGE am: 15b2a3468e  -s ours
am: af300c6513  -s ours

* commit 'af300c651304c78c1b81955778c5f566dd56226b':

Change-Id: Icf54651cb4b714e095b1eafb7aa8627ae2e7a86f