Merge "Mark NonNull for canManageSubscription parameters." into rvc-dev