Merge "Snap for 8346178 from 01c102600be4d4de633751d6ca0bc09eda527a92 to simpleperf-release" into simpleperf-release