Merge "Reduce 'final' method churn when class is 'final'"