Merge "Revoke permission on non-runtime -> runtime upgrade"