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

Change-Id: I5a22e5cc84baf73dfb74573a1efe3a35d393fc06