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

Change-Id: I4d2f047f196906f080c47e462877f991664ef7de