Add support of multiple CNIs

Change-Id: Ib2fba96acfd63830bbc6ba4bdce0112ca492df1f
26 files changed