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

Change-Id: I9601140fb9d24cec74d3c028240acaa1b7d0113d