Integrate the latest changes

Bug: 322046897
Test: atest -v batch_all_performance_test_suite -- --config local_dev_testbed.yml --testbed LocalPerformanceDefaultTestbed
Change-Id: I38b67e1083ed4bc89e8e578bfffb600e848683a1
23 files changed