Merge "Fix broken perf tests" into oc-dev
am: 974b5b13b2

Change-Id: Ic9442beef0e2bec7db53b8e6ef1ff47dc6d12769