Import translations. DO NOT MERGE am: 431ffdc8d6  -s ours
am: 3e1848fda5  -s ours

* commit '3e1848fda503ef50e296cc934e5ca50797db598c':

Change-Id: I879bbc61fbb816ec7af9464abc34ab6487d679b1