Merge "Start removing Support_PortManager."