Avoid shadowing diagnostics for @override
methods
#12415
+48
−28
Merged