Merge "Fix tests broken by @NonNull annotation fix" into main