Merge "Deprecate TunerService" into udc-qpr-dev