Merge "Fix Sensor CTS tests to reflect the new API changes." into klp-dev