Merge "Snap for 12821328 from 505580b45502b94595f5d4ba2054d4ff5a74605c to simpleperf-release" into simpleperf-release