Merge change 3499

* changes:
  Make a host version of acc for testing.