Merge change 7047

* changes:
  Run tests on both ARM and x86