Merge "Fix SensorBatchingFifoTest EOB bug" into marshmallow-cts-dev