Merge changes from topic "simpleperf_presubmit_check"
am: 4ddb2ed827

Change-Id: I2e9ae7326aec48220d275654ff344fdd80b9f942