Fix a no-op uninstall being treated as a failure am: 5faa530d1f am: f0a12aca20
am: 7a319c264c

Change-Id: If4dbcd8179a9680c9380f7152d5aa1e9fb596afa