Merge "[CDM] Exempt auto revoke for distinct packages only." into main