Merge "Enable multiple active Ethernet interfaces" am: 0a6c539901 am: ac908d6728
am: 3379a3eff9

Change-Id: Ibd84c2ba3252e3d65ba4a63a0be912747ea18df9