Snap for 7209783 from c3d69e1789b5a2fc067cf87c6a6683305a7955ee to simpleperf-release

Change-Id: Ia764d7eb7f75b61c0d9a373ffad61579226c12a3