Merge "Fix SDC docker-base verify job"