Fix performance tests

* added changes missed during rebase in #118123
* changed expected time in tests because tests
  on jenkins running longer

Change-Id: I173cb51852ce82a9c6fa7868d68f1c1026cc3315
Merge "Fix performance tests"