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

Change-Id: Id4f708616b1e9c7ad780a2a4532191872ffd44a0