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