Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread