Merge "Minor fix to avoid ConcurrentModificationException in policy-models"