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

Change-Id: I213bd1039bd588e818d156a5f531325c1b4ee513