Merge "Snap for 9023430 from 11b1061d834666a605e7a02fe757341ef224a04d to simpleperf-release" into simpleperf-release