Update Translate to master

Change-Id: I02addc4c3ddec8bade3fb4df879957e40efc021f