Fix incomplete QSController patchset

Change-Id: Ie98173c826d2113d672f260066d0ebd77cdf7cd9