Merge "Use SubscriptionId instead of SubId" into oc-dev