Merge "Snap for 11526323 from 951cd157de57fed9aae2f48c9766efe79f9b2ff4 to simpleperf-release" into simpleperf-release