Snap for 7012961 from f44020815afba5b4eaca3ee70364f21780b92923 to simpleperf-release

Change-Id: I73f3f1dd561c4feb58265ef5e827d97b627d4ba4