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

Change-Id: I3e4de8dbcd13954cf4957ff3dd813b45106231b2