Update Translate to master

Change-Id: I95b67ba7f8ee76e1ed546803ea000469bb2e5b7c