Merge "Fix issues in SensorBatchingTests" into marshmallow-cts-dev