am fc6ef518: am 326feb89: Merge "Pick an upstream interface with valid IP config" into honeycomb

* commit 'fc6ef518e0696ca45608ca07803aa50081f9f72f':
  Pick an upstream interface with valid IP config