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

Change-Id: I5cf548758617ae5c74f81a68b23893f584a46ee5