Merge "Snap for 7779618 from 7ec205920cd0c180e6154aae72cf6a531b4dca64 to simpleperf-release" into simpleperf-release