Merge "Snap for 9795718 from ecdbbbda825bb26715881037a6f3a5aaf2f95de7 to simpleperf-release" into simpleperf-release