Merge "Snap for 5435301 from 9e34eee481438cd04ff31dbc2349da71d177eecc to simpleperf-release" into simpleperf-release