Merge "Upgrade new tcagen2 policy type"