Merge "Make getSubscriptionId public"