Merge "Snap for 7817384 from 858aff25aa5dbaf5cdde29498fcdda3860831854 to simpleperf-release" into simpleperf-release