Snap for 9023430 from 791b52309d997f2c52e29a5eb0cea4e0965bb149 to simpleperf-release

Change-Id: I23f520d7d91f0be3b71df8a8fdde1348c531178d