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

Change-Id: I4936b5f67ee6c5bfcdb0be40730cc54db5a01b50