Merge "Snap for 12821328 from 2e862a2a4223e7e455683f40a0fa9219ca60cdb6 to simpleperf-release" into simpleperf-release