Merge "Snap for 12821328 from 151a298928a7942052f93ada564088bf6e31ccbc to simpleperf-release" into simpleperf-release