Merge "Use encoder id as insecure DP encoder random seed"