Merge "Snap for 9982369 from 1494f05cc32165eef4c73a6eb6b51fe235bc1d64 to simpleperf-release" into simpleperf-release