LPS-35131 @Override annotations

@hhuijser