Merge "Update CSITs for policy delta API"