Merge "Revert non-API changes to not throw UserOperationException any more" into rvc-dev