Merge "Snap for 11510257 from 34573462f4fbad6d673325fc336faa2bfb6c22aa to simpleperf-release" into simpleperf-release