Merge changes to support OVS based TOR management.

Change-Id: I295b10a1d1285060f6c1f0092d4b00f0ea988172
Merge "Merge changes to support OVS based TOR management."