Merge "Fix java doc for eraseSubscriptionsWithOptions"