Merge "Snap for 7414570 from f8654a3e7a7acb6c67637a9c29a17ee7e29a1999 to simpleperf-release" into simpleperf-release