Update Translate to master

Change-Id: I5835d83851f702c79dd2df6f0e26db2a31dd3b48