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

Change-Id: I02b9d43d862b342e5f94c4e4af759881496f2896