Merge "Sonar Major: Add the @Override annotation"