Merge "Snap for 11510257 from 9e9370211c8d37301902a086424a176f351669f4 to simpleperf-release" into simpleperf-release