Merge "Add self revocation public API"