Reland "Add template parameters to MQDescriptor"

b26628ac32fa48f414ad321a4964675b4ad59de4

Bug: 142326204

Change-Id: I78d08f84231ca19905f51b0520ede1b71df34365
5 files changed