Merge "hal: fix the set_echo_reference call sites"