Merge "Disable test on arm due to timeouts."
am: c2b4c6d

* commit 'c2b4c6df0c2c0fc21950c87ec9071518d43fd9c5':
  Disable test on arm due to timeouts.