Revert "Extract QueueInfo into its own class" This reverts commit 5ffac84cd4024a548055836a6000e57a9283214f. Reason for revert: Not strictly needed Change-Id: Ice65f4fbe6c04b15bb4da831fb284222ffcad1da