Merge "Allow wifi and ethenet connected at same time." am: 54d34fe8a7 am: 1bceeaac85
am: bf1f2c455e

Change-Id: I36b924ac20ebe58dc2a522509b83a341994ff480