Second chunk of Support_PortManager removal.

Bug: 2441548
Change-Id: Id5fb5785259700db637c17522c105e6b0bb6b89f
2 files changed