Merge "MMS APIs rely on resolveSubscriptionForOperation()"