Merge "Use "override" keyword instead of "virtual"."