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

Change-Id: I6478c02a4f37f7346a58cd980c21980234c50fec