Merge "Snap for 11510257 from 92b03ef02b1a217397b4f2223c991114b644ac0f to simpleperf-release" into simpleperf-release