Snap for 7168215 from 64430983d0aa9acca6d3df44881ab614708fce2b to simpleperf-release

Change-Id: I35ae5277dd0f9fbef442e0bc3f6c96af18816098