Merge "Fix policy/api charts"