Merge "Helper function/class to sensor cts test" into oc-dev