Merge "Add a missing @Override annotation"