Merge "Snap for 7817384 from 29aa94d12528701b7008e241e6acc2e5d1d6a127 to simpleperf-release" into simpleperf-release