Merge "Add missing OVERRIDE qualifiers in code generators."