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

Change-Id: I8d6cbd8bb65b5c9f9701a76a34c3734db66edb27