Merge "Skip resolving upstream services"