Merge "Add test API for if the device supports QS" into oc-dev