Merge "Snap for 11510257 from 879bae4b4844849b9024345ef3e9da297ca6e80f to simpleperf-release" into simpleperf-release