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

Change-Id: I55a0b4906870f08de6b72ef601c151859fc0ccfb