Merge "Allow various kinds of MQDescriptor."
am: d86a742205

Change-Id: I9b37ba6531b281ed4beb4eeadea6f735bbd4e34e