Merge "hal: fix DP-CTS failures"