Merge "start netd earlier" into main