Merge "Snap for 12821328 from f895b4c6388bb30bb16ef80cdbe27e0b0f9b4c4b to simpleperf-release" into simpleperf-release