Merge "Snap for 11400057 from 0ff49cf90374b2af84f29f39cdcf0bf340e5f111 to simpleperf-release" into simpleperf-release