Merge "Fixed some pip state acitvity accounting." into oc-dev