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

Change-Id: I95a4e5d519857950297f5948525990c4808cd5fd