Merge "Cleanup MQDescriptor usage with typedefs"