Merge "Templatize MQDescriptor" am: 61666e16bb am: 28cbdf965f
am: b1851bf12b

Change-Id: Id4b64ee1523462e924640ca273759f196fe77449