Merge "API review: SubscriptionPlan#getNetworkTypes/setNetworkTypes" into rvc-dev