Merge "Snap for 11400057 from 199709a671183465c94895e4d72ce9fccd2d46ac to simpleperf-release" into simpleperf-release