Fix missing @Override
@rev gtorres@
@bug W-2233524@
Merging origin/amcculloch/master-pending/fixOverride into master