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

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc
tree: 86a4fe420a0b81735919debd7f328daf57eea7d9
  1. core/
  2. services/
  3. tests/