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

Change-Id: I2b180336f74697ff5467c210eabccb4813ce317f