am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread

* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf