Fix uninstall not working.

Change-Id: Ib36d6cefb4c5810606867e9769eb65f12e74e256
(cherry picked from commit afad2087c29fa50364db5a2b2654040688258bbb)