Merge "Fixed some pip state acitvity accounting." into oc-dev
am: 6535ef67b7

Change-Id: Ibcb5992194f8b50a0d6451e43918e1260533c635