Merge "Snap for 9023430 from 841f4661bd5fcd086206d4e3ed16eb0432493679 to simpleperf-release" into simpleperf-release