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

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc