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

Change-Id: I9941c82ab0467fd885262aba22078fef5fda8769