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

Change-Id: I39ad444c735b5c11954700d5ae2ceaf74f747c4a