Merge "drmserver: use getCallingSid"