Snap for 5590161 from b2d6c9c5c7e10a2631945c97cec79bfcaaa7a1dd to simpleperf-release

Change-Id: I3e3221d994ad6e3c0c92d0a01dc59eb21d7e89c7