Merge "don't block uninstall of unknown packages" into oc-dev am: 627fbf8157
am: e9bec62854

Change-Id: Ice5b2d21986bfbb1735743843c6fbb178bb59ee2