Merge "Snap for 9023430 from 841d5199e1d1c64e7853fd953eed5247780908c1 to simpleperf-release" into simpleperf-release