Merge "Templatize MQDescriptor" am: 61666e16bb am: 28cbdf965f am: b1851bf12b
am: 2006103481  -s ours

Change-Id: Idc862d4b6f37606ee3a8aceadd45d7ac8c68c4a0