Merge "hal: Fix xml parse error"