Fix qs 3.0

Change-Id: I046fa425cb085e0aeda2aa1d1cba2a03156cab2f