Merge "Fix a no-op uninstall being treated as a failure" into oc-mr1-dev
am: b6ccff73dd  -s ours

Change-Id: I511fcbb0542459aca589f4ab2315b01508bbe707