Merge "sde: fix qservice compilation issue"