Merge "Fix Harmony-707 test for CTS"