Snap for 5805824 from 26f8b8cdb20f94473eafafb94d534979cb46e3d0 to simpleperf-release

Change-Id: Id2f166e5b343079977a4dd208229507c64709d8c