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