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

Change-Id: I5303c34c2ac29d4f75035b8e80ad5762013eee6a