Merge "Snap for 12901447 from cf393087b6fffd297c7f807b1efd207d35697056 to simpleperf-release" into simpleperf-release