Merge \\"More correctly track upstream network properties.\\" into nyc-mr1-dev am: 5cbbc02a0f
am: 7c02a8872c

Change-Id: I1efaf412af81823025f06b2184b1fd0abe3a34b0