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

Change-Id: Ib0521406251e6dbc0d13dcf1f7bc164e88acd1e8