Merge "Snap for 11526323 from 3aa13d0d7dce6e69cc079ac85ae66cbf4491e421 to simpleperf-release" into simpleperf-release