am 89c8f755: Merge "Fix handling of multiple possible default networks" into honeycomb

* commit '89c8f7554bbec5d62ebeddddc2ef2460265a80c5':
  Fix handling of multiple possible default networks