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