Merge "Use MQDescriptor typedefs for cleanup"