Updated Changes to reflect gwt upgrades.
Fixed merge conflict