For those interested in Tokyo's expanded queue, a Japanese YouTube user going by couperin9 shot a ton of footage before the conversion to Star Tours 2. We actually got videos with the full English language version of their entry hangar queue audio loop here.
https://www.youtube.com/watch?v=Bxy4eeyymug
Second link is a poor angle from below the droids, but the audio is slightly better
https://www.youtube.com/watch?v=n7LgBdU4I1Q