Q: Can I upgrade my 16gb iPhone 6s for a 32gb iPhone 6s?

So at the Apple event this week, Apple announced that the iPhone 6s would now come in 32gb base storage. I purchased a 16gb iPhone 6s in May from T-Mobile. Would I be able to trade in my 16gb phone for upgraded storage or not?