Merge "hal: 8916 & 8974 platform convergence"