Merge "Snap for 12901447 from 4a437e4675311c9fb7d8918a335a59cd366842a1 to simpleperf-release" into simpleperf-release