Merge "arc: Fix CTS tests for grunt"