Merge "Snap for 12901447 from a63217d7f28b1b9c39a9ab901eab5c01ff9941ae to simpleperf-release" into simpleperf-release