Merge "Keep CtsShimPriv's v2/v3 signature"