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

Change-Id: I32ca566eb6908ba8b2cc3bb8509dad8761bdeb3f