Snap for 12901447 from b0eca1149058116ff508e86cf53227121785bb85 to simpleperf-release

Change-Id: Icbe86c511196bf2c75af8b2fca79447bdd41bd59