Merge "hal: Merge 8994 platform changes to 8916."