Merge "Snap for 12821328 from 9e48dd8859c3eb6b911bcc9d1ce48a4278bd03f5 to simpleperf-release" into simpleperf-release