Merge "Templatize MQDescriptor"
am: 61666e16bb

Change-Id: Ib423003d7b0fefeb1bec3d566f1635c446687cab