Revert^2 "Add CUJ instrumentation for KQS"

0947d9f6187d8cb789a669d245eecbc9f4e0e292

Change-Id: Ifc6f2ae8f447939f274fb6167cc74c0cd2e89652
4 files changed