Merge "Sonar Major:Add @Override annotation above method"