Merge "Lock down networking when waiting for always-on" into nyc-dev