Merge "Snap for 12901447 from dab361d1e482bccdd27f38610dcc92127f36e3dd to simpleperf-release" into simpleperf-release