CBP expands public private partnerships, plans locations for 2,000 new officers