Merge "Re-enable test that was causing TimeoutExceptions on ARM64." am: dddb767f59
am: a06c72e2d8

* commit 'a06c72e2d80195f35ddf2f83d975dd20112ceab4':
  Re-enable test that was causing TimeoutExceptions on ARM64.