Merge "Snap for 12821328 from a08c10a5b34f18700af108d3331adcaa41928af7 to simpleperf-release" into simpleperf-release