Merge "When the device boots up, netd works more than required" into nyc-dev