(not changed in this pr) Looking at Subscriptions.java, was wondering if Subscription.provides should check for subProduct* as well, but on closer look, it seems that only SubscriptionServiceAdapter.getSubscriptions(owner, productid) uses this, and as best I can tell, nothing uses that now...