translation updates and other changes

Change-Id: Ia488459e041f72d38d505c5653d3aaccf353c60d