Merge "Snap for 5816375 from 681881da02360a340168422212501739dc0e33b6 to simpleperf-release" into simpleperf-release