Merge "Ensure Netd Service is alive" into nyc-dev