Merge "Increase CHAR LIMIT for policy strings"