Merge "Changed 'virtual' function override declarations to 'override' in automated...