Merge "Avoid mockito in MotionPredictorBenchmark" into main