Merge "Fix auto-pip visibility issues." into oc-dev