Merge "Setting correct HW crypto driver instance for FDE"