Merge "Snap for 5434352 from 73bb342956f8c55592edf8c93e5c1d217810576d to simpleperf-release" into simpleperf-release