Merge "Snap for 12901447 from 0e700794c41a88718292e4f26b5f0a0a8d40bb54 to simpleperf-release" into simpleperf-release