Snap for 5933730 from 2b75643580e1a1ad3086ad52ec6bb33ac04d82ff to simpleperf-release

Change-Id: I2ffad7ad0d30a53292ed5b9d2c4d6e0615edb1c5