Fix uninstall not working.

Change-Id: Ib36d6cefb4c5810606867e9769eb65f12e74e256
Merge "Fix uninstall not working."