Merge "Remove set_mac_address from old remote_client"