Merge "Merge "Add test API for if the device supports QS" into oc-dev am: be436bdefe am: b3963766c6"