Merge "Snap for 9023430 from 79ece28f29bf9b49a6527daf3e50f80d31065243 to simpleperf-release" into simpleperf-release