Merge "Use MQDescriptorSync instead of MQdescriptor in interface" am: aa3a8e0dbc am: 6635495c02
am: 7e6a4fece3

Change-Id: I6705421480782c4a9aa3d33122cec3e3abdb287c