Merge "Snap for 7817384 from 71596053e24b7f32b61360bc0f08a158a95cc485 to simpleperf-release" into simpleperf-release