Merge "Snap for 11421525 from 031838f00f205361240e9e91950d0dabf3481768 to simpleperf-release" into simpleperf-release