Merge "Templatize MQDescriptor and rename to fmq_sync/fmq_unsync"