move to new MQDescriptor.
am: 0a4512841e

Change-Id: Iec6c55095fe14c121cb1acadc6a73451fe1fb3b5