Merge "Add getSubscriptionId API"