Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-dev