Fix override non injectable.
Merge branch 'fix-override-non-injectable' into gwt