Merge "Snap for 11526323 from adb147cf125ad95aa2f47433a50242a6e8bbec5c to simpleperf-release" into simpleperf-release