Merge "ignore IllegalArgumentException during uninstall" into oc-dev
am: 8b540dc7aa

Change-Id: I350e419aa819f726fc15a5381b54b25601b8ad95