Merge "Expose SubscriptionPlan API." into oc-mr1-dev