Import translations. DO NOT MERGE am: 0671f10b17  -s ours
am: 35b47d61f6  -s ours

* commit '35b47d61f6e6cccc1d666659b07f92afa6b37088':

Change-Id: I2088a616180f6aed6fe1163c12f5a08715e2e2f5