Snap for 6844436 from 06b2c701dc031bbb97f956e8c5225dc5be8aee71 to simpleperf-release

Change-Id: Ic838a2d26b2dbc937fecf34aa3e510968086f801