Surface Pro X - SQ2 - sleep issues related to Qualcomm Location (ACPI\QCOM0472)

Hi there, 

Been having issues with sleep on Surface Pro X SQ2. 

Essentially, when the lid closes, or it goes to sleep, it sometimes didn't wake up (needing hard restart) or rebooted / crashed during sleep. This has been going on for six or so months. I did a clean install which made no difference. 

After reading through event viewer, I think I have isolated it to ACPI\QCOM0472\0 - which is Qualcomm Location services - and the driver doesn't seem to install / has error messages related to it in device manager event viewer. 

I've disabled it in device manager and it seems to be helping. Presume its hardware related? 

Thanks