Merge "Fix perf tests for cold startup." into nyc-dev
am: 31da177

* commit '31da1779e70b9a39c16d2bcc2c3cbb34785cb13b':
  Fix perf tests for cold startup.

Change-Id: I677c6b6636442d3f4fd7435de56a1de15e21a65d