Merge "Fix CTS tests to support non-AB devices."