Merge "Snap for 7209783 from 7fad978edc5dded0129bd0fae40636e47abd92e7 to simpleperf-release" into simpleperf-release