Change-Id: Icdfa71affad147c29df175ae687cbecc3f1f171b
Prepare the ground for using WSD hooks for this. Change-Id: I5c3e32396b335ad189472ab3a51044372ee304b2
This moves the code into the same process, for easier logging & debugging. Disabled initially. Change-Id: Id48b5649ba14deb0a2159ca59e321c7d0ae66dad