Merge "Snap for 7012961 from be78d20a39da3c48e906710b4e5868d670781066 to simpleperf-release" into simpleperf-release