Merge "Subscription Manager public method clean up"