Fix SF_SKIP_FETCHBASES test mishandled

Change-Id: Idae25f1e673d2ea2a48487b27e260e37ea6db80e
Merge "Fix SF_SKIP_FETCHBASES test mishandled"