add queue group support

Change-Id: Ie4f676183b90286f6abe51943798bdb8827a15cd