Merge pull request #8673 from mrjoel/mrjoel/correct-export-order

Correct ordering of export API for DescriptorTable