Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."