Merge "More correctly track upstream network properties." into nyc-mr1-dev