Merge "Handle disabled packages as removed." into oc-dev
am: 2f8f5ffc4b

Change-Id: I75f0e5fd02261d522acb79acc50fc56ef7319eb3