Astro Orbiter wait times accurate?

I noticed that on my Touring Plan, Astro Orbiter was listed with a 15 minute wait, a 2 minute ride, and then a 1 minute walk to the next attraction.

But what about the time it takes to get off the ride and then taking the elevator back down to the ground level? Is that time baked into the waiting time? I would have expected there to be an automatic extra 2 or 3 minutes added into the walk time no matter what attraction is next, OR set the ride time to include the time it takes to take the elevator.