Add more @NonNull annotations for overriden methods