Merge "Snap for 11510257 from 0aa4760e905236d21b7463a800b2bd748fc47d7e to simpleperf-release" into simpleperf-release