Merge "Fix a no-op uninstall being treated as a failure" am: fab8162abd
am: 1157a7196b

Change-Id: I9f8a65fcb375678dc1290c155ec2c755fb5bfd62