Merge "Snap for 11526323 from eed1c420872f3c31e7fed5e2383e042c8762aebf to simpleperf-release" into simpleperf-release