Merge "Fix several issues reported by partners in Sensor CtsVerifier tests." into lmp-dev