Merge "Fix test in case we run the ART_TEST_TRACE tests." am: b178e11d9e am: 4c08c8822b
am: d40badc9da

* commit 'd40badc9da9c4d94def9799a29b6e1b124af4982':
  Fix test in case we run the ART_TEST_TRACE tests.