Snap for 11526323 from b7d27055996c88ccd21e12be92be2c94ef3fbf05 to simpleperf-release

Change-Id: I739edef91182aefd7daa03a8dec9bac99cb62314