Snap for 5933730 from bd7892bb8927360cd34805bc332039154a2110e0 to simpleperf-release

Change-Id: Ia6dab8d741147d3b2f9ac2781cac8c56bd3f8bd4